projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2e3420 6a3e7b2)
bitkeeper revision 1.1705.1.16 (42a9bd07XRRfLC09WWyRiQyCeXgWTQ)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 10 Jun 2005 16:17:11 +0000 (16:17 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 10 Jun 2005 16:17:11 +0000 (16:17 +0000)
Manual merge.

1  2 
xen/arch/x86/x86_32/seg_fixup.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/x86_32/seg_fixup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.